From: Hashar <hashar@free.fr>
Date: Sat, 10 Nov 2012 16:44:44 +0000 (+0000)
Subject: Merge "(Bug 41352) Provide tests for edit conflicts."
X-Git-Tag: 1.31.0-rc.0~21672
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=6670bf66dfa0a0ae6025c63e16094bb65a9ada38;p=lhc%2Fweb%2Fwiklou.git

Merge "(Bug 41352) Provide tests for edit conflicts."
---

6670bf66dfa0a0ae6025c63e16094bb65a9ada38